css: Move icon properties to the end

The order in which properties are defined depends on the order in which
they are computed. And that means that properties can only depend on
other properties that are defined before them.

The next patches will need this reordering.

diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c
index 467d22202fb0383bea38b0cf20753b38241f81c2..bc40a063573d2b1c1ee41c1829fd6672604b7d68 100644 (file)
--- a/gtk/gtkcssstylepropertyimpl.c
+++ b/gtk/gtkcssstylepropertyimpl.c
@@ -1041,43 +1041,6 @@ _gtk_css_style_property_init_properties (void)
                                           NULL,
                                           _gtk_css_shadows_value_new_none ());
 
-  gtk_css_style_property_register        ("-gtk-icon-source",
-                                          GTK_CSS_PROPERTY_ICON_SOURCE,
-                                          G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_ANIMATED,
-                                          GTK_CSS_AFFECTS_ICON,
-                                          css_image_value_parse_with_builtin,
-                                          NULL,
-                                          NULL,
-                                          _gtk_css_image_value_new (gtk_css_image_builtin_new ()));
-  gtk_css_style_property_register        ("icon-shadow",
-                                          GTK_CSS_PROPERTY_ICON_SHADOW,
-                                          G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED,
-                                          GTK_CSS_AFFECTS_ICON | GTK_CSS_AFFECTS_CLIP,
-                                          shadow_value_parse,
-                                          NULL,
-                                          NULL,
-                                          _gtk_css_shadows_value_new_none ());
-  gtk_css_style_property_register        ("-gtk-icon-style",
-                                          GTK_CSS_PROPERTY_ICON_STYLE,
-                                          G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_INHERIT,
-                                          GTK_CSS_AFFECTS_ICON,
-                                          icon_style_parse,
-                                          NULL,
-                                          NULL,
-                                          _gtk_css_icon_style_value_new (GTK_CSS_ICON_STYLE_REQUESTED));
-  gtk_css_style_property_register        ("-gtk-icon-transform",
-                                          GTK_CSS_PROPERTY_ICON_TRANSFORM,
-                                          G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_ANIMATED,
-                                          GTK_CSS_AFFECTS_ICON | GTK_CSS_AFFECTS_CLIP,
-                                          transform_value_parse,
-                                          NULL,
-                                          NULL,
-                                          _gtk_css_transform_value_new_none ());
-
   gtk_css_style_property_register        ("box-shadow",
                                           GTK_CSS_PROPERTY_BOX_SHADOW,
                                           G_TYPE_NONE,
@@ -1495,6 +1458,43 @@ _gtk_css_style_property_init_properties (void)
                                                                      _gtk_css_number_value_new (1, GTK_CSS_NUMBER),
                                                                      _gtk_css_number_value_new (1, GTK_CSS_NUMBER)));
 
+  gtk_css_style_property_register        ("-gtk-icon-source",
+                                          GTK_CSS_PROPERTY_ICON_SOURCE,
+                                          G_TYPE_NONE,
+                                          GTK_STYLE_PROPERTY_ANIMATED,
+                                          GTK_CSS_AFFECTS_ICON,
+                                          css_image_value_parse_with_builtin,
+                                          NULL,
+                                          NULL,
+                                          _gtk_css_image_value_new (gtk_css_image_builtin_new ()));
+  gtk_css_style_property_register        ("icon-shadow",
+                                          GTK_CSS_PROPERTY_ICON_SHADOW,
+                                          G_TYPE_NONE,
+                                          GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED,
+                                          GTK_CSS_AFFECTS_ICON | GTK_CSS_AFFECTS_CLIP,
+                                          shadow_value_parse,
+                                          NULL,
+                                          NULL,
+                                          _gtk_css_shadows_value_new_none ());
+  gtk_css_style_property_register        ("-gtk-icon-style",
+                                          GTK_CSS_PROPERTY_ICON_STYLE,
+                                          G_TYPE_NONE,
+                                          GTK_STYLE_PROPERTY_INHERIT,
+                                          GTK_CSS_AFFECTS_ICON,
+                                          icon_style_parse,
+                                          NULL,
+                                          NULL,
+                                          _gtk_css_icon_style_value_new (GTK_CSS_ICON_STYLE_REQUESTED));
+  gtk_css_style_property_register        ("-gtk-icon-transform",
+                                          GTK_CSS_PROPERTY_ICON_TRANSFORM,
+                                          G_TYPE_NONE,
+                                          GTK_STYLE_PROPERTY_ANIMATED,
+                                          GTK_CSS_AFFECTS_ICON | GTK_CSS_AFFECTS_CLIP,
+                                          transform_value_parse,
+                                          NULL,
+                                          NULL,
+                                          _gtk_css_transform_value_new_none ());
+
   gtk_css_style_property_register        ("transition-property",
                                           GTK_CSS_PROPERTY_TRANSITION_PROPERTY,
                                           G_TYPE_NONE,

diff --git a/gtk/gtkcsstypesprivate.h b/gtk/gtkcsstypesprivate.h
index a9796cc9e728ff698bc231b154da621cb8cbdb7d..88bc6f647a234e65ef64f54e2c13ed26d1a80cbb 100644 (file)
--- a/gtk/gtkcsstypesprivate.h
+++ b/gtk/gtkcsstypesprivate.h
@@ -118,10 +118,6 @@ enum { /*< skip >*/
   GTK_CSS_PROPERTY_FONT_WEIGHT,
   GTK_CSS_PROPERTY_FONT_STRETCH,
   GTK_CSS_PROPERTY_TEXT_SHADOW,
-  GTK_CSS_PROPERTY_ICON_SOURCE,
-  GTK_CSS_PROPERTY_ICON_SHADOW,
-  GTK_CSS_PROPERTY_ICON_STYLE,
-  GTK_CSS_PROPERTY_ICON_TRANSFORM,
   GTK_CSS_PROPERTY_BOX_SHADOW,
   GTK_CSS_PROPERTY_MARGIN_TOP,
   GTK_CSS_PROPERTY_MARGIN_LEFT,
@@ -165,6 +161,10 @@ enum { /*< skip >*/
   GTK_CSS_PROPERTY_BORDER_IMAGE_REPEAT,
   GTK_CSS_PROPERTY_BORDER_IMAGE_SLICE,
   GTK_CSS_PROPERTY_BORDER_IMAGE_WIDTH,
+  GTK_CSS_PROPERTY_ICON_SOURCE,
+  GTK_CSS_PROPERTY_ICON_SHADOW,
+  GTK_CSS_PROPERTY_ICON_STYLE,
+  GTK_CSS_PROPERTY_ICON_TRANSFORM,
   GTK_CSS_PROPERTY_TRANSITION_PROPERTY,
   GTK_CSS_PROPERTY_TRANSITION_DURATION,
   GTK_CSS_PROPERTY_TRANSITION_TIMING_FUNCTION,